additional awesome tweaks
Merge branch 'octotweak'
win dangit