enabled some stuff I commented out for testing