fixed opacity problems mostly and some  db inefficiencies
dotting i's and crossing t's
fixed merge conflict