minor edits, still not ready to run...