Updated some more stuff, more class goodies etc.