Added preamble message
Various minor changes