fixing glitch and final revisions