Bug fixes and improvements

Fix an issue where multiple builds on one commit would give incorrect status.

Handle cancelled status.

Other improvements.