Solved a few bugs and cosmetic failures