Added PM and bugfixes