bug fixes for 1.0