made some nice changes, enter/exit for one