Results 2 issues of Tom Burris

Please test it out and give me feedback for any changes you think would improve it.

This time from a branch, and not master :)