updated, removed work arounds and added/removed patch files