more bug fixes
 mroe bug fixes