Cleaning up, and some visual stuff