Added explaining an included file and removed name collisions
Added a few more detailed error messages