improve admin, add job exchange
fix merge conflicts