misc bug fixes
misc bug fixes
merged