fixes for teach and stuff