update with some TODOs for other hooks
Trimmed some mp3s, added new hooks
Merge branch 'develop'