Changed function signatures and cleaned things up
Fixed user input and cleaned up printfs