Updated with fixes and TODO section.