Fixed up some syntactical errors and added TODOs
Fixed up some syntactical errors and added TODOs


Former-commit-id: df59b977acbc5a34204209aaa0ba1715602af3fe
plus3it/SystemPrep,lorengordon/SystemPrep,plus3it/SystemPrep,lorengordon/SystemPrep