Added dealer shoe and bug fixes