Added grace-period and did some changes to the config.

Signed-off-by: Lucas Arnström <lucasarnstrom@gmail.com>