bugfixes and more specs