Fixed most things