Fixed colspanning so that the cell state keeps track of the width so far properly Also some cleanup, jstyle Code changes sponsored by Dresdner Bank, Germany