minor bugfixes

rewrite code