extra source documentation and TODO's