Cleanup

Small UI fixes, displaying correct values in log.