Update tortoise

Bug fixes and filling out implementation