polling added and enabled by default. minor code cleanup.