commented out buggy things?