correct minor warnings
correct simulation