Fixed software block bugs
Merging