fix styles
fix regexp support