minor changes. WIP!