Tidy. Fix bugs.