done styling for now, merging with master