Jenny | Fixed some bugs