cleanup and some lame UI work