Add comments, try to fix junit failures