Some mechanics fixes and pp changes