fixed some ids
master