Abstraction fixes, capability fixes, added some cap checks.