Noob mistakes being fixed