Updating some comments and fixing tabs