Leave() update, various bug fixes