Size improvements, some cleanup, better hash params