Corrected a bug which allows any number of position commands
Cleaned up useless changes
Merge branch 'smoothing'