Major improvements w/o Github screwup code