Fixed scralet conflict and updated comments