suggest some fixes/improvements