small cleanups + accuracy things, but stuff still sounds like ass