added hashes to params in CompanyVal and OptionsGrant
cleanup and light refactoring
lots of refactoring
cleanup and refactoring