more fixes and additions for various tickets