trivial issues corrected