Ticker clean up and bug fixes.