checkRequirements in engine improved
Some tidying up