Fixes, updated symbols in map