Some fixes and some commented out stuff.