Update comments regarding event callbacks, move property update back to bottom