Updated a few bits here and there ;)