commenting a couple of things out until they can be fixed