Housekeeping, documentation changes and minor code formatting
Changed it so that folder context so its data is never null
fixed a problematic value assignment in a spec