File revving with less bugs and more features