bug fixes;