Small Changes
Small fix of hooks
Merge branch 'master' into captainsmode