added support for UPC A, began comments clean up