some minor updates, includes some crappy debug stuff to scrub and next should look at next_line overflowing and cleaning out unused methods