new tiles, fixed missing
fixed bugs, cleanup
upstream(fixed switches)