Finishing up some stuff