Application status updates: remove TODOs, added more 'why' comments, made logic more explicit.