misc edits / adds