Lots more info and some cleanup