Modified plan file and committing minor fixes