Fixed trajectory management.
Removed debra specific constants and added config options.