Bugfixes, added repeatable job