fixes

960/940 block fixing, forms with modifications to fit Marton' specification