just kidding, fixed more mistakes. should be good now