fix transition builder problem + minor changes