fixing syntax, more organized
merge
syntax fixes