made changes 1-5 suggested by Mike