formatting/bug fixes