fixed error message, added TODO
made conditional structures more sctrict: expecting boolean expressions
updated test-script
updated test-script