- more bug fixes