resolved major bugs against alpha