updated with missing api changes
updated some more API changes, closes #235
fixed mrege conflict from develop