Some changes made, soon going to change AUR stuff