Added JobManager, Fixed some issues