Minor changes trying to get shit to work