Added and moved some comments