Tons of fixes/changes