Several fixes, added PEnum