Little fixes
Added version capabilities