fixed cairomm issues and stylistic changes