Added a few things from Robbie's config