Dev

- fixed runtime errors
- minor bugfixes