Revert "Fit to console function"

This reverts commit 898cadbf099436ca1af220528672c4b3dc552940.
Correctly fitting to console

Also minor changes