added a bit of functionality; made a few aesthetic tweaks