Handful of bug fixes & minor features, finish btn