Fixed some issues
Added some feature info