Add some more functions
Style argument list
Add type info to functions