fixed some new years bugs