Some cleanup and corrected readme with TODO list.