added some style stuff
fixed conflicts, recommit styles