part of JML board done
more JML in board
merge conflicts resolved