Cleanup up output, bug fix in curosr update.