a lot of changes

contrast, fixes, gospel added, test