some file cleanup and added location tracking
fixing some small things