bug fixes in sitter