tmp dev
minor bugfixes