fixed some regexs and added a load more