Change requiring and loading and minor other fixes
Update tasks and functionality