Changed the formatting of the output variables a bit and added ones that were missing for easier debugging