Lots of fixes after going live