huge update to blocks and hammer

Please check if more is needed