Work on graphics

Fix a few things in CPU and memory