Added plurization, fixed some code