small code revisions