Made a lot of nice changes