Made a bunch of fixes to parameterization of moves.  These changes make the composer work more or less as intended.