Fixed a couple bugs we think (actualy just brought old code back)  but still no labels