more work on street.lua, more refactoring