Some changes I made

I made some changes to get things working a little better.