#7 Lots of code cleanup and testing of other speedmodrow types. Everything seems to be working. Hopefully this is it for this issue.