added suggestion comments, various other little changes