Mostly commenting of exsisting functions with the odd minor code change