Better start and reset handling, rename constants