cleaned up commented out code and added 'no data' to areas that didn't have data