Cleared up argument, made some notes for further extension