Fixed some visuals and a possible bug