Bugfixes for 0.7

YES HELLO COMMITS HERE