Updated makediag(), removed unused arguements.
MPC 08: account for subsampling in the objective