Added some more stuff. Again, not tested.