Bug fixes and documentation update. Some bugs still present in Collections logic