committing minor changes since i'm taking a break to avoid conflicts