Bug fixes & config.json improvements