Some bug fixes, some nicening of outputs