fixed some handlers