adding detail, index and urls
removing binaries
add git ignore
fixing merge conflicts
test improvements