updated fixed alpha logic etc