made some nice changes