Fixing ng app, indentation, added TODOs :D