made some for styling edits. commiting before merginf from master
fixed conflicts to merge