Spacing and bugfixes