fix ticker, rename some functions