massive update. looks much better.