Fixed some bugs here and there