fix: include map, code cleanup
scan, hold - not working