General changes and fixes

And more abilites