Added push manager, minor fixes throughout code