Cleanup and fixed some hooks