Fixed current functions to only reflect solving and moved output to main code