finished round two of bug fixes before push