First steps towards separate jobs process
fix bugs