bugfixes

works good with firefox