finished updating Josim to work with new constraint code.
finished adding back P and dP into the OS notebook.