unbloomed and fixed some bugs