commit minor bug fixes on simulator