Fixed warnings for blocks
Refactored block names so that they are closer to the action.
Renamed holder fields to eliminate log spam
Added documenting comments
Merge branch 'feature/Fix_log_spam' into develop

Fixes #38