First fixes
1. Final fixing
2. Adding "list" and "count" commands just for my pleasure