Fixes and added TODO List