more bug fixing and ticker