Multiple changes

*Fixed some formatting issues
*Added the ID mapping to item ids.