Minor changes from actually running it on my computer.