Small edits

Clean up - fixes, etc