Updated for the latest stable threadly version, as well as some other minor improvements