more bugs *sigh*