move scenarios
change scenario descriptions
fix style