Cleaner URL handling. APT url support added.