Fixed most of [?]