fix

- minor bugfixes