Some minor changes for visual purposes (v0.1a)