some fixes, lot of style stuff
more style stuff