style and error changes