got rid of some jank
placed exit in the right place