Changed some comments, renamed properties