fix source addition form + some cleanup