Fixed Hooks
fixed bugs in settings