Fix rendering with alpha; misc improvements