Updating components; New demo bugs