Fixed abilitys, and edited shop layout