few fixes, still some errors :(