POTS more updates

Should be ready for full QM tests