minor edits and cleanup
minor progress