so i spent today (now yesterday) fixing it