add StayHere, cleanup comments