bug fixes for 1.1