Improve config option stuff
Organize methods
Fix compile issues