tons of fixes here so we can nearly go live with this