Fancyglass, last minute bugfixes