Added some new stuff here and there.