Iron out a few kinks