minor updates, elimnated a few console.log()