Added transparency and few small fixes