Update TODO
Update CHANGELOG
Restructured code
Add check for untracked files
Uniformalize status messages