minor changes
merged from remote
Sequential Data association wrapping in progress -- TO TEST