James' stuff works\!  Also changed some comments