More formatting/bug fixes