big cleanup
fixes in mapping loaders
updated the documentation