fixes #8, lots of other fixes, removes! source combination option (too hard for now)
minor fixes