Hopefully most things fixed