Commented some core functionality