rolled back and fixed several broken items..