Made some minor fixes and improvements to the composer interface.