autotoolery and minor cleaning