Removed use of parse-number, is done automatically by yason
Endless loop bug, misc