working in windows, check in and try on other OS
clean up a few comments
properly check for defined extbang
fix conflicts