Final changes

Spiced things up a bit...