Reworked abilities some more

Pretty much the same as previous, except that everything works properly,
so far.