most cosmetic bugs fixed