add fill functionality
fix source issues