removed some old stuff, added fix for new line number behavior
slimmed down plugin load