cs fixes, updating libs