Small bugfixes and added the alias module.