housecleaning
more changes ensuring proper dev, needs regex fix with qt5