Clean-ups and minor fixes.
Fixed table names.
Reduced file names.
Split up targets for starting a shell.
Small newline cleanups.