Bug Fixes and Start of Location Display Functionality