more bugs to fix