Initial extraction file
Some improvements all around
Updates