Improved graphics

Can now write window-level images as well
Improved naming consistency