added docu fix bugs