bug removed...mostly