bugs and other fixes