Added basic printing support
Minor changes