Small changes
Add more config options
Resolve conflicts