Fixed Comments/Copyright and added ids instead of null.