deleted comments, some fixes