strip last beta leftovers and fix syntax errors, travis is kinda down, lets hope nothing breaks while I sleep
