#52, #42, #25 Finished for active configurations + code cleanup.