minor aesthetics
merged changes from matt