fixes, and client getter