further notifs optimizations, finalized claim and custom
Merge pull request #125 from BuracayBeach/team2_v2.7

further notifs optimizations, finalized claim and custom