todo added
syntax fixes
syntax fixes