changed variable names, fixed small stuff
update submodule pointer