Messing around and fixing code