small improvements, fixed regex bug