Some clean up also provide more informative support when resolving
Added more informative resolveError messages not show declaration and line count
where possible