Minor eyecandy changes and bugfixes.