Major update; looks more decent.