Cleanups: bootstrap code and messages
Initial commit of data import script