fixing shattuck bugs...