start cleanup and corrections/improvements