updated; some things working, some not