Several improvements

Sources without link are allowed now as well.