more testing on location
better help screens