Fixed More Basic Shapes *Merge*

More of my stupid dumb code I added to them that was causing the FPS
example not to work properly, I fixed them all up and it works again. Please merge when ready.