Changes some function signatures to non static as they were not required
to be static. Also correct errors that occured because of the changes to
function signatures