added events; build against 1.6.4