Tidy ups, and fixing showChange