Progress on bugs but still working