more updates. most things are working