Fixed some more things. Bet it does't compile