Bug fix for missing locations. Adding a limitation to the documentation and improving the counting.