Docco comments
Bug fixes