Improved Print, and Minor fixes