Updated a lot

Almost done. Getting some weird painting error, which stinks