better handing of pointers in analyzer, commented out lines removed