minor bugfixes throughout
style