fixed jae's bugs