fixed regex. will finish up cli and gui today, hopefully ;)
happy easter.