Fixed duplicate packages and added auto add for single packages (thanks Bogomips)