python: added maps & better solving