Fix Amazon support
Better command handling - client messages are wrapped at 40 columns, running commands no longer brings up an error message