woohoo, fix up final bugs