Requirements Rewording/Changes

See comments in source for reasoning.