Make some cosmetic changes and integrate xml doc from dropbox