finishing up some stuff