More tweaks

Work dammit!