Finished some things we had on our todo for a while.