fixing point restraint
restoring old BuildModel1 macro (though deprecated)
bug fixes to analysis