Change in input handling

Also conversion of constant ints for trajectory types to enums