fixed script location and cleanup
fixed mistakes