correcting user reference, etc.