all bug fixes