with more bug fixes