Meditation updates
Fixing conflicts
Random edits
Merge branch 'sethcim-serial'

Add Seth's attention fix.
More random changes
Add Seth's attention changes