Optimizations, tweaks, fixed obnoxious reverse