Publishing this to be safe, might come back,

Fix a couple of things, depends on how it goes.