Added extra check for error status after build.
Cleaned up TODO list.