fix things, refactor