Small improvements, added comments and references