syntax fixes, developing client usage.