Updated ignore list, Fixed some bugs