Making more updates, cleaning up more code
.;