Revert "Quick Fixes #1"

This reverts commit 0cf4581bbab3ae689cd1f2b194a34e9fa02a65ce.
Revert "Access Changes / Map Fix #1"

This reverts commit 93da7c4706a47b67f35edc205e32789e2eedee2b.