[Phoo]: cosmetics & bug fixes