Added comments and configs