performance and stylefixes