Fixed command line method handling and page creation code
Generation fixes