minor fixes , major problem somewhere in the shot class ...