small fix on transitions, not finished