Fixed some compile errors. Removed TODOs. Those tasks are now issues in github
Merge branch 'master' of github.com:JaySoyer/Advanced-Adapters