Rewrote app/Manager and fixed some small finishWatch-related bugs in Container/Application