minor edits. take default stuff out