A few other bits I remember as I don't think it is any of the above

there is a woman on her own - tho i think her housekeeper lived there before she was killed

then her boyfriend comes to stay with her

the librarian gets killed when she tries to visit - the electric gates close on her and her car and crush her to death
the housekeeper gets blown into the pool and drowns
the boyfriend survives at the end


Hope that helps