more bug fixes...again