Cleaned things up, v1.1