Fixed some minor errors, started retooling shiftop