Some improvements

I've implemented some of the improvements and hopefully query performance is much better; certainly the home page is much faster now. There are some additional optimizations contemplated but those are going to have to wait for awhile.