Level 2 and some Fixes