Change order of functions
Add a couple more misc functions