sigh, bug fixes for scheduler and client.