Minor additions and added mouselistener.