couple fixes, more options and additional regexes