Fixing a few bugs, modifications for simulator testing.