fixed poptype bug and removed cruft from xml