Add some comments, fix stuff