Finishing touches and minor bug fixes.