fixed registry bugs and added block support