Updated some issues and docu