Added User scripts, Some fixes