Updates for opacity overlap and some other things =]