minor changes, add more yardoc tags and documentation