Some more commenting done