User Script Changes

A few fixes here and there