Fixed some, review all