Small fixes, due to development on my branch so i had to pull it out of
it.