refactor, updated libs, maps