minor refactor
remove fstrack ds, refactor wzimage ds, minor changes, comments