ticker fix
Merge branch 'bugs'