12_26_updated bug fixes

12_26_updated bug fixes