Defect fixes and selenium re-included (STOP REMOVING GUYS gawd)