misc bug fixes and first draft of set