- Re-added completion check to hook
- Misc. cleanup