updated some comments and fixed some properties