trackable changing fixed, other small fixes
tidied command line