more crap.

Extended description here.
amend a few more because this is working?
Merge pull request #2 from terryopie/yet-another

more stuff.