Updated Guidelines and some minor changes