Minor debugging & new sources added