Added DPS compensation + bug fixes