tweaked config and scripts