Added Guard and edited config files