Teacher improvements