user improvements, refactoring
-rwxr-xr-x 2377 conflink