Fixing stuff and adding config