Fixed a few issues post arc-update
Update comments and bring block properties to header again. Setter declarations provide auto-complete