Debug a bunch of bugs
Bugfixes - no-crash run
More bugfixes and edge cases