Added station_id to commercial_block, lots of schema corrections.