adding water parser and fixes to style parser