added positional prototypes
removed debug code
modified data structure for positional queries
debugging
merged