MAde minor improvements to track form