Fixed most minor changes