more bugs fixed; not there yet