Lots of new detection support. Closes #9(finally!), and closes #71