fixed regex stuff