comments and logs improved