More contract fixes. Please use the agreed upon coding style for the project. This includes Javadoc style commenting. Do not be afraid to delete sections of unused code.