fix sorting and removed some defaults