small fixes and reverted some transparency-related code