Fixed some merging errors...some still exist