finishing up some kinks