Updated, minor bugfixes

Updated, minor bugfixes