Updated feature symbols, added marker for address, cleaned up code.