BUGFIXES

Squashed multipl bugs