fixed some format issues