Level 2

Plus some fixes.
Merge huerg

Ya ne vinovat