Updated comments. Minor changes in API
Some fixes
Updated docs