better filter layer system and more marker clean up