bug fixes and print support