bugfixes and less