enter and exit working
tweaked enter/exit logic
added getters