added missing super calls to __init__ so multiple/diamond inheritance resolves correctly; removed some commented code that no longer needs to exist