YES! Resolved #3 by editing regex on line 36 :D