Some fixes, switched repository.

Just merged my changes into the proper repository, and done some small
changes.