Fixed some tiny problems

now let's find the big ones!