More testing, modifications made as appropriate.