Updated pistol model and more work on AI