fixes for transitions
fix for options