a few little changes (mostly tick handler)