Config fixes; closes #16 #17 #18 #19