Sources added
Some cleanup