Semicolons fixed, Improvements to functions

Functions can be set default values, so I set some