Bugfixes

Fixed some of the easy issues.