few more bugs to fix