issue #40
changed names
changed getters and setters
changed jsp
clean up