styling stuff
fixed various merge conflicts