Various updates (bug fix, improvements, syntax, etc.)