addressed several issues