Updated config usage and added some comments