removed commentary
fixed level bug
updated tests
added TODO's