some client stuff. clean up mostly