Bunch of updates to make things rock hard