cleaned up naming, fixed controller bugs, mostly typos