fix some shit up/ speed increase