params and soruce fixes