cleanup/speedtest additions