Added comments describing two pain in the ass issues