OCHAROCCA tweaks/fixes, start work on handling Map layers via context