Fixed Bugs in End.java - see method update()