bugfixes + started working on PMs