bugfix
formating
regexp fix