I have a tip for getting your cat to stop spraying:
Find the area(s) your cat has been spraying and sprinkle the floor around it with cyan pepper. If they don't smell it they will get it on their paws and eventually lick them. Once they taste the yucky stuff they won't go in that area anymore!