Contraction of source files in list
Fix for deleting breakpoint
Misc. changes