Fixed some things. Housekeeping n'at.