fixed errors, still there's work to be done though