fixed errors
Merge branch 'master' into test-logic
started work on level adjustment
fixed merge errors
started implementing level adjustment