New pop up, new parser, bug fixes