Finished up some more stuff in the to do list