Minor changes. Starting transition to HTML 5 Canvas