Fixed various more aesthetic problems