tweaks, bug fixes and added print btn