Testing tweaks

To make the things do stuff and a bug fix or two.
I am kinda bad at this whole Git thing.