minor formatting/problem fixes