more testing/tweaking formatting