another fix
alot of fixes