clean up, logix fixed, renamed