huge fix

was soo much work!