fixing stuff I broke with moving the components