Fixed functions, will now have correct type, and decls will print
correctly