Finishing up a few things