finished up some stuff