misc bug fixes, just about ready for 1st release!