Updated docs, setup and messages