Cleanup and bugfix user script
Test user
Cleanup, add, fix main script