comments and small fixes