block and menu modules almost done

and several minor updates