commented out what is not ready. Fixed a bug checking capabilities