improved config and scripts