level cleanup for forest level, some code fixes