fabfile improvements and such