Finishing up some small details