minor changes
minor bugfixes