fix stuff up so it builds

made these changes and it builds now. still testing to find out what is broken though so maybe more pulls after this one :D