Added some alternative popn defs
Comments, renamed some params, added bug note