Minor Changes

just before moving to core data implementation