Fixed delay issues and saved settings