Did some things that will hopefully make it a bit faster