Updates to code and such