Bug fixes, expanded Thief class