still has somewhat weird spacing, but it will be hopefully easy to fix.
Pavel, please check whether it builds in your environment as well.