few more changes. probably good enough to start working on the ui a little...