Small changes to output to user. Some bug fixes.