Small fixes, almost there, still paints with mouse, for some reason