misc bug fixes, updates