Aesthetics and bug fixes