Added some abilities, as well as a bit of code cleanup.