Consulting changes
Added supervisor module and fixed minor bugs