fixed src regexing and accounting for comments