More stuff

I saw the code and some things were bothering me so I just re-did everything. This should give you a good starting point.