Fix same bugs and make new visuals