Additional Block Fixes

@radicaldesigns Sorry for fucking this up so badly - additional changes to get it working here.