Finished all testing
Revised several details in the Entities