fixed 2-3 (3-3?) major bugs