new bugs and fixes