Minor adjustments
close #2