more edits, adjustments, new features