Fixed small bug in indexing addresses. Made fns private. Added 'search' ns.