fixes1

several fixes, still not working properly