Small edits

Small edits and bug fixes