*Bug fixes*
- some crash fixes