Added more default data, removed default comments