some final improvements

i think this should be the final commit - everything works really stable
now :)