bug fixes(?), output formatting