comments and some fixes