still working out more bugs