Added features to P.hs, modified code

Added all features we have to P.hs, including possible type names for
them. Fixed conflicts - code now compiles.