Updated with veterancy / give bugfixes