fixed some focus issues