Many Fixes and wrk on print