fixed misc formatting and small problems