Cleaned up a bunch of TODOs, tidied code.
Merge pull request #7 from shalecraig/accel_v2_cleanup_TODOs

Cleaned up a bunch of TODOs, tidied code.