block buttons added, misc improvements