-more bug fixes