Small updates
Quick fix ID

Should be renamed to name later on!