Added a few bits, and done some housekeeping.

Xarlos.