Improve Scotty config
Final touches