if i was you i get some one in to re-do the entire lot, as what you have at the mo is an accident waiting to happen.