Add build status & minor cleanup